From 5b0de5ae73756518c0e059e4d834789db907daec Mon Sep 17 00:00:00 2001 From: Albert Krewinkel Date: Mon, 10 Jun 2013 11:44:53 +0000 Subject: [PATCH] lisp/gnus/sieve.el: Fix handling of PORT parameter, quitting --- lisp/gnus/ChangeLog | 9 +++++++++ lisp/gnus/sieve.el | 13 +++++++------ 2 files changed, 16 insertions(+), 6 deletions(-) diff --git a/lisp/gnus/ChangeLog b/lisp/gnus/ChangeLog index f097ae03e5f..5f4f74b3356 100644 --- a/lisp/gnus/ChangeLog +++ b/lisp/gnus/ChangeLog @@ -1,3 +1,12 @@ +2013-06-10 Albert Krewinkel + + * sieve.el: Put point at beginning of buffer when viewing a script. + (sieve-open-server): respect the PORT parameter. Show the correct port + number in sieve-buffer's header. Fixed code to also work with a string + as port specifier. Properly close the connection on pressing 'q'. Make + sieve-manage-quit close the connection and process buffer. Also, remove + duplicate keybinding for 'q'. + 2013-06-10 Roy Hashimoto (tiny change) * mm-view.el (mm-pkcs7-signed-magic): Allow newline in the regexp and diff --git a/lisp/gnus/sieve.el b/lisp/gnus/sieve.el index 0e46cb66361..2c11c039d56 100644 --- a/lisp/gnus/sieve.el +++ b/lisp/gnus/sieve.el @@ -109,7 +109,6 @@ require \"fileinto\"; ;; various (define-key map "?" 'sieve-help) (define-key map "h" 'sieve-help) - (define-key map "q" 'kill-buffer) ;; activating (define-key map "m" 'sieve-activate) (define-key map "u" 'sieve-deactivate) @@ -152,6 +151,8 @@ require \"fileinto\"; (defun sieve-manage-quit () "Quit." (interactive) + (sieve-manage-close sieve-manage-buffer) + (kill-buffer sieve-manage-buffer) (kill-buffer (current-buffer))) (defun sieve-activate (&optional pos) @@ -206,6 +207,7 @@ require \"fileinto\"; (insert sieve-template)) (sieve-mode) (setq sieve-buffer-script-name name) + (beginning-of-buffer) (message (substitute-command-keys "Press \\[sieve-upload] to upload script to server.")))) @@ -256,10 +258,9 @@ Used to bracket operations which move point in the sieve-buffer." (setq buffer-read-only nil) (erase-buffer) (buffer-disable-undo) - (insert "\ -Server : " server ":" (or port sieve-manage-default-port) " - -") + (let* ((port (or port sieve-manage-default-port)) + (header (format "Server : %s:%s\n\n" server port))) + (insert header)) (set (make-local-variable 'sieve-buffer-header-end) (point-max))) @@ -305,7 +306,7 @@ Server : " server ":" (or port sieve-manage-default-port) " (with-current-buffer (or ;; open server (set (make-local-variable 'sieve-manage-buffer) - (sieve-manage-open server)) + (sieve-manage-open server port)) (error "Error opening server %s" server)) (sieve-manage-authenticate))) -- 2.30.2